From 61e74858f89e89012d97acb590cfe8e5859fb58b Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 6 Jul 2004 18:49:28 +0000 Subject: [PATCH] bitkeeper revision 1.1041.1.14 (40eaf438sciOdZWe5QAqcjLLtbzF2Q) Minor PCI tweaks to move ever so slightly toward 2.6 and make ia64 (based on 2.6) easier. --- xen/drivers/pci/pci.c | 4 ++-- xen/include/asm-x86/pci.h | 2 +- xen/include/xen/pci.h | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index 258d9d8c8a..f8697d1337 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -890,7 +890,7 @@ pci_set_mwi(struct pci_dev *dev) u16 cmd; #ifdef HAVE_ARCH_PCI_MWI - rc = pcibios_set_mwi(dev); + rc = pcibios_prep_mwi(dev); #else rc = pci_generic_prep_mwi(dev); #endif @@ -1384,7 +1384,7 @@ struct pci_dev * __devinit pci_scan_slot(struct pci_dev *temp) temp->hdr_type = hdr_type & 0x7f; dev = pci_scan_device(temp); - if (!pcibios_scan_all_fns() && func == 0) { + if (!pcibios_scan_all_fns(0,0) && func == 0) { if (!dev) break; } else { diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index 1a217315a4..c5f72c0fae 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -12,7 +12,7 @@ extern unsigned int pcibios_assign_all_busses(void); #else #define pcibios_assign_all_busses() 0 #endif -#define pcibios_scan_all_fns() 0 +#define pcibios_scan_all_fns(a,b) 0 extern unsigned long pci_mem_start; #define PCIBIOS_MIN_IO 0x1000 diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index f4d9d72f9c..90fce051b1 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -393,6 +393,10 @@ struct pci_dev { this is D0-D3, D0 being fully functional, and D3 being off. */ +#ifdef LINUX_2_6 + struct device dev; /* Generic device interface */ +#endif + /* device is compatible with these IDs */ unsigned short vendor_compatible[DEVICE_COUNT_COMPATIBLE]; unsigned short device_compatible[DEVICE_COUNT_COMPATIBLE]; -- 2.30.2